From: Keir Fraser <keir.fraser@citrix.com>
Date: Wed, 6 Jan 2010 09:39:01 +0000 (+0000)
Subject: x86: XEN_DOMCTL_MEM_SHARING_OP_CONTROL should not depend on HAP.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~12781
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22?a=commitdiff_plain;h=5da045d64736cec6b8678110715b73abc7290af6;p=xen.git

x86: XEN_DOMCTL_MEM_SHARING_OP_CONTROL should not depend on HAP.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
---

diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c
index 1b254fcab3..cb461ac928 100644
--- a/xen/arch/x86/mm/mem_sharing.c
+++ b/xen/arch/x86/mm/mem_sharing.c
@@ -731,12 +731,9 @@ int mem_sharing_domctl(struct domain *d, xen_domctl_mem_sharing_op_t *mec)
     {
         case XEN_DOMCTL_MEM_SHARING_OP_CONTROL:
         {
-            rc = 0;
-            if(!hap_enabled(d))
-                return -EINVAL;
             d->arch.hvm_domain.mem_sharing_enabled = mec->u.enable;
             mem_sharing_audit();
-            return 0; 
+            rc = 0;
         }
         break;